merge trunk
authorKenichi Handa <handa@etlken>
Mon, 28 Jun 2010 03:32:18 +0000 (12:32 +0900)
committerKenichi Handa <handa@etlken>
Mon, 28 Jun 2010 03:32:18 +0000 (12:32 +0900)

Trivial merge